From aba228a612b679747286fcd7c80c64ebe969bbd5 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Wed, 1 Oct 2014 19:37:10 +0000 Subject: [PATCH] debian-hardened-buildflags-CPPFLAGS Gbp-Pq: Name debian-hardened-buildflags-CPPFLAGS.diff --- config_host.mk.in | 1 + configure.ac | Bin 464305 -> 464439 bytes solenv/gbuild/gbuild.mk | 2 ++ 3 files changed, 3 insertions(+) diff --git a/config_host.mk.in b/config_host.mk.in index c3e3ba35b25..1e264217d61 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -72,6 +72,7 @@ export CPPUNIT_CFLAGS=$(gb_SPACE)@CPPUNIT_CFLAGS@ export CPPUNIT_LIBS=$(gb_SPACE)@CPPUNIT_LIBS@ export CPUNAME=@CPUNAME@ export CDEFAULTOPT=@CDEFAULTOPT@ +export HARDEN_CPPFLAGS=@HARDEN_CPPFLAGS@ export CROSS_COMPILING=@CROSS_COMPILING@ export CURL=@CURL@ export CURL_CFLAGS=$(gb_SPACE)@CURL_CFLAGS@ diff --git a/configure.ac b/configure.ac index 850680e6cb3b3f7fe4bd7ee768343386598a80fd..a4b066ac69de4b3d901172e56eff23250f0acb84 100644 GIT binary patch delta 160 zcmdnET4wtinT8g|7N!>F7M3lnSLaV}Y-1G3ODV`s*G($T%t=YhNlY)cRw&6x&Ew+q za13&B^^1272ypXpbPu*oKvSontDBx$q5zXuFtXE6NiEaQE6vGC;7ZHna&(Rl4s{9+ i(Lgn5x}XAc!1M`Mnc1cbOk(9}H(tQH-FN|8T`2%>6g4IQ delta 39 xcmV+?0NDSxtQ@hc9DsxYgaU*Egaot&)t{F{)dNzO5RwH9hq<5yx4EDOesw>N5BvZC diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 23d5591cfcb..ccd3fc21b50 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -254,6 +254,8 @@ gb_GLOBALDEFS += \ ENABLE_LTO \ ) +gb_GLOBALDEFS += $(HARDEN_CPPFLAGS) + gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS)) include $(GBUILDDIR)/Deliver.mk -- 2.30.2